Rollup of 6 pull requests #133189

GuillaumeGomez · 2024-11-18T21:07:35Z

Successful merges:

Report the unexpected_cfgs lint in external macros #132577 (Report the unexpected_cfgs lint in external macros)
Improve {BTreeMap,HashMap}::get_key_value docs. #132758 (Improve {BTreeMap,HashMap}::get_key_value docs.)
[rustdoc] Fix items with generics not having their jump to def link generated #133180 ([rustdoc] Fix items with generics not having their jump to def link generated)
Update books #133181 (Update books)
const_panic: inline in bootstrap builds to avoid f16/f128 crashes #133182 (const_panic: inline in bootstrap builds to avoid f16/f128 crashes)
Add reference annotations for diagnostic attributes #133187 (Add reference annotations for diagnostic attributes)

r? @ghost
@rustbot modify labels: rollup

…other tests

They are unusual methods. The docs don't really describe the cases when they might be useful (as opposed to just `get`), and the examples don't demonstrate the interesting cases at all. This commit improves the docs and the examples.

This adds reference annotations for `diagnostic::on_unimplmented` and the `diagnostic` namespace in general.

…o, r=petrochenkov Report the `unexpected_cfgs` lint in external macros This PR marks the `unexpected_cfgs` lint as being reportable in external macros, as it's probably not the intention of the macro author to leave ineffective cfgs in the users code. Fixes rust-lang#132572 try-job: aarch64-gnu-debug

…docs, r=cuviper Improve `{BTreeMap,HashMap}::get_key_value` docs. They are unusual methods. The docs don't really describe the cases when they might be useful (as opposed to just `get`), and the examples don't demonstrate the interesting cases at all. This commit improves the docs and the examples.

…enerics, r=notriddle [rustdoc] Fix items with generics not having their jump to def link generated Because the span originally included the generics, during the highlighting, it was not retrieved and therefore its jump to def link was not generated. r? `@notriddle`

Update books ## rust-lang/edition-guide 2 commits in 2d482e203eb6d6e353814cf1415c5f94e590b9e0..915f9b319c2823f310430ecdecd86264a7870d7e 2024-11-06 07:23:07 UTC to 2024-11-05 09:03:41 UTC - 2021: Update for raw lifetimes (rust-lang/edition-guide#330) - CI: Switch to merge queue (rust-lang/edition-guide#333) ## rust-lang/nomicon 1 commits in 456b904f791751892b01282fd2757904993c4c26..eac89a3cbe6c4714e5029ae8b5a1c556fd4e8c42 2024-11-16 14:05:28 UTC to 2024-11-16 14:05:28 UTC - Fix typo in what-unsafe-does (rust-lang/nomicon#469) ## rust-lang/reference 10 commits in da0f6dad767670da0e8cd5af8a7090db3272f626..41ccb0e6478305401dad92e8fd3d04a4304edb4c 2024-11-15 21:45:16 UTC to 2024-11-05 21:46:30 UTC - Add identifiers to attributes.md and its subchapters (rust-lang/reference#1560) - Fix 2 typos (rust-lang/reference#1674) - Add examples to clarify the casting rules (rust-lang/reference#686) - Explaining how to link mixed C/Rust binaries. (rust-lang/reference#838) - Add Arm64EC to inline-assembly documentation (rust-lang/reference#1653) - Add three more WebAssembly features to the list of accepted ones (rust-lang/reference#1638) - Add s390x to inline-assembly documentation (rust-lang/reference#1643) - trait object constraint correction (rust-lang/reference#1670) - Update some "default" representation references (rust-lang/reference#1667) - Update lifetimes for pre-expansion validation (rust-lang/reference#1668) ## rust-lang/rustc-dev-guide 12 commits in 6a5accdaf10255882b1e6c59dfe5f1c79ac95484..b679e71c2d66c6fe13e06b99ac61773b866213f0 2024-11-18 08:18:15 UTC to 2024-11-05 07:22:17 UTC - Mention `RUSTC_BOOTSTRAP` for misc testing (rust-lang/rustc-dev-guide#2136) - Document how to acquire `cdb.exe` (rust-lang/rustc-dev-guide#2137) - Document `max-llvm-major-version` directive (rust-lang/rustc-dev-guide#2129) - Document `exact-llvm-major-version` directive (rust-lang/rustc-dev-guide#2135) - Note Rustfmt for separate rust-analyzer directory (rust-lang/rustc-dev-guide#2134) - still accurate (rust-lang/rustc-dev-guide#2133) - typo (rust-lang/rustc-dev-guide#2132) - add valid date-check marker (rust-lang/rustc-dev-guide#2131) - Update parallel-rustc.md (rust-lang/rustc-dev-guide#1926) - Rename `{ignore,only}-debug` -> `{ignore,needs}-{rustc,std}-debug-assertions` (rust-lang/rustc-dev-guide#2101) - update const stability docs (rust-lang/rustc-dev-guide#2111) - Ask folks to use the Oxford comma in diagnostics (rust-lang/rustc-dev-guide#2093)

…oss35 const_panic: inline in bootstrap builds to avoid f16/f128 crashes This should fix rust-lang#133177. `@uweigand` could you test that?

…ouxu Add reference annotations for diagnostic attributes This adds reference annotations for `diagnostic::on_unimplmented` and the `diagnostic` namespace in general. There's also a rename for a test that looks like it was put in the wrong location.

GuillaumeGomez · 2024-11-18T21:07:52Z

@bors r+ p=6 rollup=never

bors · 2024-11-18T21:07:56Z

📌 Commit 87d1684 has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2024-11-19T00:19:01Z

⌛ Testing commit 87d1684 with merge e364066...

…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros) - rust-lang#132758 (Improve `{BTreeMap,HashMap}::get_key_value` docs.) - rust-lang#133180 ([rustdoc] Fix items with generics not having their jump to def link generated) - rust-lang#133181 (Update books) - rust-lang#133182 (const_panic: inline in bootstrap builds to avoid f16/f128 crashes) - rust-lang#133187 (Add reference annotations for diagnostic attributes) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-11-19T02:06:02Z

The job x86_64-gnu-aux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   |
18 | #[derive(Debug, Default, Deserialize)]
   |                          ^^^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: `#[warn(unexpected_cfgs)]` on by default
   = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)


warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> /checkout/obj/build/ct/tokei/target/debug/build/tokei-0c9142fe0b372c1b/out/language_type.rs:5:10
  |
5 | #[derive(Deserialize, Serialize)]
  |          ^^^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> /checkout/obj/build/ct/tokei/target/debug/build/tokei-0c9142fe0b372c1b/out/language_type.rs:5:23
  |
5 | #[derive(Deserialize, Serialize)]
  |                       ^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src/language/languages.rs:20:26
   |
20 | #[derive(Debug, Default, Serialize)]
   |                          ^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src/language/mod.rs:15:24
   |
15 | #[derive(Clone, Debug, Deserialize, Default, PartialEq, Serialize)]
   |                        ^^^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning]  --> src/language/mod.rs:15:57
   |
15 | #[derive(Clone, Debug, Deserialize, Default, PartialEq, Serialize)]
   |                                                         ^^^^^^^^^
   |
   = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
   = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> src/stats.rs:4:10
  |
4 | #[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
  |          ^^^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Deserialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: unexpected `cfg` condition value: `cargo-clippy`
warning: unexpected `cfg` condition value: `cargo-clippy`
##[warning] --> src/stats.rs:4:23
  |
4 | #[derive(Deserialize, Serialize, Clone, Debug, PartialEq)]
  |                       ^^^^^^^^^
  |
  = note: expected values for `feature` are: `all`, `cbor`, `default`, `hex`, `json`, `serde_cbor`, `serde_json`, `serde_yaml`, and `yaml`
  = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
  = note: this warning originates in the derive macro `Serialize` (in Nightly builds, run with -Z macro-backtrace for more info)

warning: non-local `impl` definition, `impl` blocks should be written at the same level as their item

bors · 2024-11-19T02:06:42Z

💔 Test failed - checks-actions

fmease · 2024-11-19T03:05:15Z

@bors r-

Urgau · 2024-11-19T06:50:12Z

2024-11-19T02:05:49.9489800Z error: Undefined Behavior: trying to retag from <53159255> for SharedReadWrite permission at alloc18732698[0x10], but that tag does not exist in the borrow stack for this location
2024-11-19T02:05:49.9502185Z ##[error]   --> /checkout/library/core/src/ptr/non_null.rs:375:18
2024-11-19T02:05:49.9504060Z     |
2024-11-19T02:05:49.9504867Z 375 |         unsafe { &*self.as_ptr().cast_const() }
2024-11-19T02:05:49.9505330Z     |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9505725Z     |                  |
2024-11-19T02:05:49.9506555Z     |                  trying to retag from <53159255> for SharedReadWrite permission at alloc18732698[0x10], but that tag does not exist in the borrow stack for this location
2024-11-19T02:05:49.9507537Z     |                  this error occurs as part of retag at alloc18732698[0x0..0x30]
2024-11-19T02:05:49.9508030Z     |
2024-11-19T02:05:49.9508795Z     = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental
2024-11-19T02:05:49.9510442Z     = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information
2024-11-19T02:05:49.9511405Z help: <53159255> was created by a SharedReadWrite retag at offsets [0x0..0x29]
2024-11-19T02:05:49.9512064Z    --> /checkout/library/core/src/ptr/mod.rs:799:5
2024-11-19T02:05:49.9512458Z     |
2024-11-19T02:05:49.9512696Z 799 |     r
2024-11-19T02:05:49.9512959Z     |     ^
2024-11-19T02:05:49.9513414Z help: <53159255> was later invalidated at offsets [0x18..0x20] by a write access
2024-11-19T02:05:49.9514047Z    --> std/src/sys/sync/rwlock/queue.rs:396:13
2024-11-19T02:05:49.9514434Z     |
2024-11-19T02:05:49.9514763Z 396 |             node.prev = AtomicLink::new(None);
2024-11-19T02:05:49.9515200Z     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9515908Z     = note: BACKTRACE (of the first span) on thread `unnamed-1009`:
2024-11-19T02:05:49.9516902Z     = note: inside `core::ptr::NonNull::<sys::sync::rwlock::queue::Node>::as_ref::<'_>` at /checkout/library/core/src/ptr/non_null.rs:375:18: 375:46
2024-11-19T02:05:49.9517786Z note: inside `sys::sync::rwlock::queue::find_tail_and_add_backlinks`
2024-11-19T02:05:49.9518356Z    --> std/src/sys/sync/rwlock/queue.rs:279:18
2024-11-19T02:05:49.9518785Z     |
2024-11-19T02:05:49.9519098Z 279 |             next.as_ref().prev.set(Some(current));
2024-11-19T02:05:49.9519512Z     |                  ^^^^^^^^
2024-11-19T02:05:49.9519962Z note: inside `sys::sync::rwlock::queue::RwLock::unlock_queue`
2024-11-19T02:05:49.9520518Z    --> std/src/sys/sync/rwlock/queue.rs:646:33
2024-11-19T02:05:49.9520896Z     |
2024-11-19T02:05:49.9521304Z 646 |             let tail = unsafe { find_tail_and_add_backlinks(to_node(state)) };
2024-11-19T02:05:49.9521878Z     |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9522419Z note: inside `sys::sync::rwlock::queue::RwLock::lock_contended`
2024-11-19T02:05:49.9522976Z    --> std/src/sys/sync/rwlock/queue.rs:437:21
2024-11-19T02:05:49.9523355Z     |
2024-11-19T02:05:49.9523653Z 437 |                     self.unlock_queue(next);
2024-11-19T02:05:49.9524077Z     |                     ^^^^^^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9524526Z note: inside `sys::sync::rwlock::queue::RwLock::write`
2024-11-19T02:05:49.9525043Z    --> std/src/sys/sync/rwlock/queue.rs:356:13
2024-11-19T02:05:49.9525411Z     |
2024-11-19T02:05:49.9525693Z 356 |             self.lock_contended(true)
2024-11-19T02:05:49.9526093Z     |             ^^^^^^^^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9526634Z note: inside `sync::rwlock::RwLock::<usize>::write`
2024-11-19T02:05:49.9527138Z    --> std/src/sync/rwlock.rs:362:13
2024-11-19T02:05:49.9527485Z     |
2024-11-19T02:05:49.9527744Z 362 |             self.inner.write();
2024-11-19T02:05:49.9528114Z     |             ^^^^^^^^^^^^^^^^^^
2024-11-19T02:05:49.9528460Z note: inside closure
2024-11-19T02:05:49.9528837Z    --> std/src/sync/rwlock/tests.rs:533:46
2024-11-19T02:05:49.9529297Z     |
2024-11-19T02:05:49.9529637Z 533 |                     let mut write_guard = rw.write().unwrap();
2024-11-19T02:05:49.9530118Z     |                                              ^^^^^^^
2024-11-19T02:05:49.9530397Z 
2024-11-19T02:05:49.9530880Z note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
2024-11-19T02:05:49.9531393Z 
2024-11-19T02:05:50.0179540Z error: aborting due to 1 previous error
2024-11-19T02:05:50.0180091Z 
2024-11-19T02:05:50.0645583Z �[1m�[31merror�[0m�[1m:�[0m test failed, to rerun pass `-p std --lib`
2024-11-19T02:05:50.0646227Z 
2024-11-19T02:05:50.0646400Z Caused by:
2024-11-19T02:05:50.0649342Z   process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/cargo-miri runner /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/miri/aarch64-apple-darwin/debug/deps/std-5829c9a3d280046b 'time::' 'sync::' 'thread::' 'env::' -Z unstable-options --format json` (exit status: 1)

@fmease I don't think it's has anything to do with my lint PR. Looks like it's more about UB in std?

@rust-lang/miri does this remind you of anything?

RalfJung · 2024-11-19T06:54:59Z

Yeah this looks like #121950, also see #128640.

fmease · 2024-11-19T06:56:57Z

Oof, sorry. I should've looked closer >.<

RalfJung · 2024-11-19T07:03:43Z

I filed #133200 to disable this test in Miri on macOS.

ignore an occasionally-failing test in Miri This is like rust-lang#128640, the test [sometimes](rust-lang#133189) fails due to rust-lang#121950.

Rollup merge of rust-lang#133200 - RalfJung:miri-rwlock-test, r=tgross35 ignore an occasionally-failing test in Miri This is like rust-lang#128640, the test [sometimes](rust-lang#133189) fails due to rust-lang#121950.

ehuss and others added 18 commits November 15, 2024 14:09

Move diagnostic::on_unimplemented test to the directory with all the …

5319425

…other tests

Improve {BTreeMap,HashMap}::get_key_value docs.

2765432

They are unusual methods. The docs don't really describe the cases when they might be useful (as opposed to just `get`), and the examples don't demonstrate the interesting cases at all. This commit improves the docs and the examples.

Fix typo

8ea0257

Fix items with generics not having their jump to def link generated

786b747

Add regression test for jump to def links on items with generics

8b0f8cb

const_panic: inline in bootstrap builds to avoid f16/f128 crashes

31f5c3b

Report unexpected_cfgs lint in external macros

cc48194

Update anstream to 0.6.18 to fix a check-cfg issue

e8bd643

Bump stdarch to the latest master

58664de

Update xshell and xshell-macros to v0.2.7

79c8e64

Add reference annotations for diagnostic attributes

1b0e787

This adds reference annotations for `diagnostic::on_unimplmented` and the `diagnostic` namespace in general.

Update books

3adbc16

Rollup merge of rust-lang#133182 - RalfJung:const-panic-inline, r=tgr…

519184f

…oss35 const_panic: inline in bootstrap builds to avoid f16/f128 crashes This should fix rust-lang#133177. `@uweigand` could you test that?

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2024

fmease mentioned this pull request Nov 19, 2024

Report the unexpected_cfgs lint in external macros #132577

Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2024

fmease closed this Nov 19, 2024

RalfJung mentioned this pull request Nov 19, 2024

ignore an occasionally-failing test in Miri #133200

Merged

GuillaumeGomez deleted the rollup-rhylr1f branch November 19, 2024 09:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #133189

Rollup of 6 pull requests #133189

GuillaumeGomez commented Nov 18, 2024

GuillaumeGomez commented Nov 18, 2024

bors commented Nov 18, 2024

bors commented Nov 19, 2024

rust-log-analyzer commented Nov 19, 2024

bors commented Nov 19, 2024

fmease commented Nov 19, 2024

Urgau commented Nov 19, 2024

RalfJung commented Nov 19, 2024

fmease commented Nov 19, 2024

RalfJung commented Nov 19, 2024

Rollup of 6 pull requests #133189

Rollup of 6 pull requests #133189

Conversation

GuillaumeGomez commented Nov 18, 2024

GuillaumeGomez commented Nov 18, 2024

bors commented Nov 18, 2024

bors commented Nov 19, 2024

rust-log-analyzer commented Nov 19, 2024

bors commented Nov 19, 2024

fmease commented Nov 19, 2024

Urgau commented Nov 19, 2024

RalfJung commented Nov 19, 2024

fmease commented Nov 19, 2024

RalfJung commented Nov 19, 2024